From 6a71ad64886c8fb7702555e65f7e045882b3ee2d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 09:00:26 +0100 Subject: [PATCH] Normalize various packaging files with wrap-and-sort -a --- debian/changelog | 1 + debian/control | 149 +++++++++++++++++----------------- debian/control.in | 149 +++++++++++++++++----------------- debian/gtk-4-examples.install | 14 ++-- debian/libgtk-4-bin.install | 6 +- debian/libgtk-4-dev.install | 8 +- 6 files changed, 165 insertions(+), 162 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ebdc139c2..be8126cc05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ gtk+4.0 (3.92.1-2) UNRELEASED; urgency=medium * Canonicalize permissions of debian/rules * New upstream release 3.94 * d/copyright: Update + * Normalize various packaging files with wrap-and-sort -a -- Jeremy Bicha Fri, 19 Jan 2018 22:05:35 -0500 diff --git a/debian/control b/debian/control index 972f5f8d37..1befebd3d3 100644 --- a/debian/control +++ b/debian/control @@ -3,59 +3,59 @@ Section: libs Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Emilio Pozuelo Monfort , Iain Lane , Jeremy Bicha , Michael Biebl -Build-Depends: debhelper (>= 10.3~), - gnome-pkg-tools (>= 0.11), - dpkg-dev (>= 1.17.14), +Build-Depends: adwaita-icon-theme , + at-spi2-core , autoconf-archive, - gtk-doc-tools (>= 1.26), - meson (>= 0.42.1), - pkg-config, dbus , + debhelper (>= 10.3~), + dpkg-dev (>= 1.17.14), + gnome-pkg-tools (>= 0.11), + gobject-introspection (>= 1.41.3), gsettings-desktop-schemas , - adwaita-icon-theme , - at-spi2-core , - libglib2.0-dev (>= 2.53.0), - libgdk-pixbuf2.0-dev (>= 2.30.0), - libpango1.0-dev (>= 1.40.5), - libatk1.0-dev (>= 2.15.1), + gtk-doc-tools (>= 1.26), libatk-bridge2.0-dev, + libatk1.0-dev (>= 2.15.1), + libcairo2-dev (>= 1.14.0), + libcolord-dev (>= 0.1.9), + libcups2-dev (>= 1.2), libegl1-mesa-dev [linux-any], libepoxy-dev, - libgraphene-1.0-dev (>= 1.5.1), libfontconfig1-dev, + libgdk-pixbuf2.0-dev (>= 2.30.0), + libgirepository1.0-dev (>= 1.39.0), + libglib2.0-dev (>= 2.53.0), + libgraphene-1.0-dev (>= 1.5.1), libharfbuzz-dev (>= 0.9), + libjson-glib-dev, + libpango1.0-dev (>= 1.40.5), + librest-dev, libvulkan-dev [linux-any], libwayland-dev (>= 1.9.91) [linux-any], - wayland-protocols (>= 1.9) [linux-any], - libxkbcommon-dev (>= 0.2.0), libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, + libxkbcommon-dev (>= 0.2.0), + libxkbfile-dev, libxml2-utils, libxrandr-dev (>= 2:1.5.0), - libxcursor-dev, - libxcomposite-dev, - libxdamage-dev, - libxkbfile-dev, - libxinerama-dev, - libxfixes-dev, - libcairo2-dev (>= 1.14.0), - libcups2-dev (>= 1.2), - libcolord-dev (>= 0.1.9), - librest-dev, - libjson-glib-dev, - gobject-introspection (>= 1.41.3), - libgirepository1.0-dev (>= 1.39.0), + meson (>= 0.42.1), + pkg-config, sassc, + wayland-protocols (>= 1.9) [linux-any], xauth , - xvfb , -Build-Depends-Indep: libglib2.0-doc, + xvfb +Build-Depends-Indep: docbook-xml, + docbook-xsl, libatk1.0-doc, - libpango1.0-doc, libcairo2-doc, - docbook-xml, - docbook-xsl, - xsltproc, + libglib2.0-doc, + libpango1.0-doc, + xsltproc Standards-Version: 4.1.0 Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4 Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git @@ -64,16 +64,16 @@ Homepage: http://www.gtk.org/ Package: libgtk-4-0 Architecture: any Multi-Arch: same -Depends: libgtk-4-common (>= ${source:Version}), +Depends: adwaita-icon-theme, + hicolor-icon-theme, + shared-mime-info, ${misc:Depends}, ${shlibs:Depends}, - hicolor-icon-theme, - adwaita-icon-theme, - shared-mime-info + libgtk-4-common (>= ${source:Version}) Provides: gtk4-binver-4.0.0 Recommends: libgtk-4-bin -Suggests: librsvg2-common, - gvfs +Suggests: gvfs, + librsvg2-common Breaks: gnome-themes-standard (<< 3.6), gtk3-engines-oxygen (<< 1.4.1-3) Pre-Depends: ${misc:Pre-Depends} @@ -90,8 +90,8 @@ XC-Package-Type: udeb Section: debian-installer Priority: extra Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Provides: gtk4-binver-4.0.0 Description: GTK+ graphical user interface library - minimal runtime This is a udeb, or a microdeb, for the debian-installer. @@ -108,8 +108,8 @@ Package: libgtk-4-common Section: misc Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, - libgtk-3-common +Depends: libgtk-3-common, + ${misc:Depends} Recommends: libgtk-4-0 Description: common files for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user @@ -123,11 +123,12 @@ Package: libgtk-4-bin Section: misc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, - libgtk-4-0 (>= ${source:Version}), +Depends: gtk-update-icon-cache, + libgtk-3-bin, + ${misc:Depends}, + ${shlibs:Depends}, libgtk-4-common (>= ${source:Version}), - gtk-update-icon-cache, - libgtk-3-bin + libgtk-4-0 (>= ${source:Version}) Description: programs for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -141,34 +142,34 @@ Package: libgtk-4-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libgtk-4-0 (= ${binary:Version}), - gir1.2-gtk-4.0 (= ${binary:Version}), - libgtk-4-common, - ${misc:Depends}, - ${shlibs:Depends}, - libglib2.0-dev (>= 2.53.0), - libgdk-pixbuf2.0-dev (>= 2.30.0), - libpango1.0-dev (>= 1.40.5), - libatk1.0-dev (>= 2.15.1), +Depends: gir1.2-gtk-4.0 (= ${binary:Version}), libatk-bridge2.0-dev, + libatk1.0-dev (>= 2.15.1), libcairo2-dev (>= 1.14.0), + libegl1-mesa-dev [linux-any], libepoxy-dev (>= 1.0), libfontconfig1-dev, + libgdk-pixbuf2.0-dev (>= 2.30.0), + libglib2.0-dev (>= 2.53.0), libgraphene-1.0-dev (>= 1.5.1), + libpango1.0-dev (>= 1.40.5), + libwayland-dev (>= 1.9.91) [linux-any], libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, - libxinerama-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, + libxkbcommon-dev, libxrandr-dev, - libxcursor-dev, - libxfixes-dev, - libxcomposite-dev, - libxdamage-dev, pkg-config, - libegl1-mesa-dev [linux-any], - libwayland-dev (>= 1.9.91) [linux-any], wayland-protocols (>= 1.9) [linux-any], - libxkbcommon-dev + ${misc:Depends}, + ${shlibs:Depends}, + libgtk-4-common, + libgtk-4-0 (= ${binary:Version}) Suggests: libgtk-4-doc Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user @@ -184,8 +185,8 @@ Section: doc Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Recommends: libglib2.0-doc, - libatk1.0-doc, +Recommends: libatk1.0-doc, + libglib2.0-doc, libpango1.0-doc Suggests: devhelp Description: documentation for the GTK+ graphical user interface library @@ -201,10 +202,10 @@ Package: gtk-4-examples Section: x11 Priority: extra Architecture: any -Depends: ${shlibs:Depends}, +Depends: gtk-3-examples, ${misc:Depends}, - libgtk-4-0 (= ${binary:Version}), - gtk-3-examples + ${shlibs:Depends}, + libgtk-4-0 (= ${binary:Version}) Description: example files for GTK+ 4 GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -218,15 +219,15 @@ Package: gir1.2-gtk-4.0 Section: introspection Architecture: any Multi-Arch: same -Depends: libgtk-4-common, +Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}, - ${gir:Depends} + libgtk-4-common Breaks: python-gi (<< 3.18), - python3-gi (<< 3.18), + python3-gi (<< 3.18) Provides: gir1.2-gdk-4.0 (= ${binary:Version}), gir1.2-gdkx11-4.0 (= ${binary:Version}), - gir1.2-gsk-4.0 (= ${binary:Version}), + gir1.2-gsk-4.0 (= ${binary:Version}) Description: GTK+ graphical user interface library -- gir bindings GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable diff --git a/debian/control.in b/debian/control.in index 454cc8fb2a..f770f2e1aa 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,59 +3,59 @@ Section: libs Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 10.3~), - gnome-pkg-tools (>= 0.11), - dpkg-dev (>= 1.17.14), +Build-Depends: adwaita-icon-theme , + at-spi2-core , autoconf-archive, - gtk-doc-tools (>= 1.26), - meson (>= 0.42.1), - pkg-config, dbus , + debhelper (>= 10.3~), + dpkg-dev (>= 1.17.14), + gnome-pkg-tools (>= 0.11), + gobject-introspection (>= 1.41.3), gsettings-desktop-schemas , - adwaita-icon-theme , - at-spi2-core , - libglib2.0-dev (>= 2.53.0), - libgdk-pixbuf2.0-dev (>= 2.30.0), - libpango1.0-dev (>= 1.40.5), - libatk1.0-dev (>= 2.15.1), + gtk-doc-tools (>= 1.26), libatk-bridge2.0-dev, + libatk1.0-dev (>= 2.15.1), + libcairo2-dev (>= 1.14.0), + libcolord-dev (>= 0.1.9), + libcups2-dev (>= 1.2), libegl1-mesa-dev [linux-any], libepoxy-dev, - libgraphene-1.0-dev (>= 1.5.1), libfontconfig1-dev, + libgdk-pixbuf2.0-dev (>= 2.30.0), + libgirepository1.0-dev (>= 1.39.0), + libglib2.0-dev (>= 2.53.0), + libgraphene-1.0-dev (>= 1.5.1), libharfbuzz-dev (>= 0.9), + libjson-glib-dev, + libpango1.0-dev (>= 1.40.5), + librest-dev, libvulkan-dev [linux-any], libwayland-dev (>= 1.9.91) [linux-any], - wayland-protocols (>= 1.9) [linux-any], - libxkbcommon-dev (>= 0.2.0), libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, + libxkbcommon-dev (>= 0.2.0), + libxkbfile-dev, libxml2-utils, libxrandr-dev (>= 2:1.5.0), - libxcursor-dev, - libxcomposite-dev, - libxdamage-dev, - libxkbfile-dev, - libxinerama-dev, - libxfixes-dev, - libcairo2-dev (>= 1.14.0), - libcups2-dev (>= 1.2), - libcolord-dev (>= 0.1.9), - librest-dev, - libjson-glib-dev, - gobject-introspection (>= 1.41.3), - libgirepository1.0-dev (>= 1.39.0), + meson (>= 0.42.1), + pkg-config, sassc, + wayland-protocols (>= 1.9) [linux-any], xauth , - xvfb , -Build-Depends-Indep: libglib2.0-doc, + xvfb +Build-Depends-Indep: docbook-xml, + docbook-xsl, libatk1.0-doc, - libpango1.0-doc, libcairo2-doc, - docbook-xml, - docbook-xsl, - xsltproc, + libglib2.0-doc, + libpango1.0-doc, + xsltproc Standards-Version: 4.1.0 Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4 Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git @@ -64,16 +64,16 @@ Homepage: http://www.gtk.org/ Package: @SHARED_PKG@ Architecture: any Multi-Arch: same -Depends: @COMMON_PKG@ (>= ${source:Version}), +Depends: adwaita-icon-theme, + hicolor-icon-theme, + shared-mime-info, ${misc:Depends}, ${shlibs:Depends}, - hicolor-icon-theme, - adwaita-icon-theme, - shared-mime-info + @COMMON_PKG@ (>= ${source:Version}) Provides: @GTK_BINVER_DEP@ Recommends: @BIN_PKG@ -Suggests: librsvg2-common, - gvfs +Suggests: gvfs, + librsvg2-common Breaks: gnome-themes-standard (<< 3.6), gtk3-engines-oxygen (<< 1.4.1-3) Pre-Depends: ${misc:Pre-Depends} @@ -90,8 +90,8 @@ XC-Package-Type: udeb Section: debian-installer Priority: extra Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} Provides: @GTK_BINVER_DEP@ Description: GTK+ graphical user interface library - minimal runtime This is a udeb, or a microdeb, for the debian-installer. @@ -108,8 +108,8 @@ Package: @COMMON_PKG@ Section: misc Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, - libgtk-3-common +Depends: libgtk-3-common, + ${misc:Depends} Recommends: @SHARED_PKG@ Description: common files for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user @@ -123,11 +123,12 @@ Package: @BIN_PKG@ Section: misc Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, - @SHARED_PKG@ (>= ${source:Version}), +Depends: gtk-update-icon-cache, + libgtk-3-bin, + ${misc:Depends}, + ${shlibs:Depends}, @COMMON_PKG@ (>= ${source:Version}), - gtk-update-icon-cache, - libgtk-3-bin + @SHARED_PKG@ (>= ${source:Version}) Description: programs for the GTK+ graphical user interface library GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -141,34 +142,34 @@ Package: @DEV_PKG@ Section: libdevel Architecture: any Multi-Arch: same -Depends: @SHARED_PKG@ (= ${binary:Version}), - gir1.2-gtk-4.0 (= ${binary:Version}), - @COMMON_PKG@, - ${misc:Depends}, - ${shlibs:Depends}, - libglib2.0-dev (>= 2.53.0), - libgdk-pixbuf2.0-dev (>= 2.30.0), - libpango1.0-dev (>= 1.40.5), - libatk1.0-dev (>= 2.15.1), +Depends: gir1.2-gtk-4.0 (= ${binary:Version}), libatk-bridge2.0-dev, + libatk1.0-dev (>= 2.15.1), libcairo2-dev (>= 1.14.0), + libegl1-mesa-dev [linux-any], libepoxy-dev (>= 1.0), libfontconfig1-dev, + libgdk-pixbuf2.0-dev (>= 2.30.0), + libglib2.0-dev (>= 2.53.0), libgraphene-1.0-dev (>= 1.5.1), + libpango1.0-dev (>= 1.40.5), + libwayland-dev (>= 1.9.91) [linux-any], libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, - libxinerama-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, + libxkbcommon-dev, libxrandr-dev, - libxcursor-dev, - libxfixes-dev, - libxcomposite-dev, - libxdamage-dev, pkg-config, - libegl1-mesa-dev [linux-any], - libwayland-dev (>= 1.9.91) [linux-any], wayland-protocols (>= 1.9) [linux-any], - libxkbcommon-dev + ${misc:Depends}, + ${shlibs:Depends}, + @COMMON_PKG@, + @SHARED_PKG@ (= ${binary:Version}) Suggests: @DOC_PKG@ Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user @@ -184,8 +185,8 @@ Section: doc Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Recommends: libglib2.0-doc, - libatk1.0-doc, +Recommends: libatk1.0-doc, + libglib2.0-doc, libpango1.0-doc Suggests: devhelp Description: documentation for the GTK+ graphical user interface library @@ -201,10 +202,10 @@ Package: @EXAMPLES_PKG@ Section: x11 Priority: extra Architecture: any -Depends: ${shlibs:Depends}, +Depends: gtk-3-examples, ${misc:Depends}, - @SHARED_PKG@ (= ${binary:Version}), - gtk-3-examples + ${shlibs:Depends}, + @SHARED_PKG@ (= ${binary:Version}) Description: example files for GTK+ 4 GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable @@ -218,15 +219,15 @@ Package: gir1.2-gtk-4.0 Section: introspection Architecture: any Multi-Arch: same -Depends: @COMMON_PKG@, +Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}, - ${gir:Depends} + @COMMON_PKG@ Breaks: python-gi (<< 3.18), - python3-gi (<< 3.18), + python3-gi (<< 3.18) Provides: gir1.2-gdk-4.0 (= ${binary:Version}), gir1.2-gdkx11-4.0 (= ${binary:Version}), - gir1.2-gsk-4.0 (= ${binary:Version}), + gir1.2-gsk-4.0 (= ${binary:Version}) Description: GTK+ graphical user interface library -- gir bindings GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable diff --git a/debian/gtk-4-examples.install b/debian/gtk-4-examples.install index baf047da6e..be5f203739 100644 --- a/debian/gtk-4-examples.install +++ b/debian/gtk-4-examples.install @@ -1,18 +1,18 @@ -usr/bin/gtk4-encode-symbolic-svg +# Currently shipped by gtk-3-examples +#usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml +#usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml usr/bin/gtk4-demo usr/bin/gtk4-demo-application +usr/bin/gtk4-encode-symbolic-svg usr/bin/gtk4-icon-browser usr/bin/gtk4-widget-factory usr/share/applications/gtk4-demo.desktop usr/share/applications/gtk4-icon-browser.desktop usr/share/applications/gtk4-widget-factory.desktop -usr/share/icons/hicolor/*/*/gtk4-widget-factory* usr/share/icons/hicolor/*/*/gtk4-demo* -# Currently shipped by gtk-3-examples -#usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml -#usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml -usr/share/man/*/gtk4-encode-symbolic-svg.* -usr/share/man/*/gtk4-demo.* +usr/share/icons/hicolor/*/*/gtk4-widget-factory* usr/share/man/*/gtk4-demo-application.* +usr/share/man/*/gtk4-demo.* +usr/share/man/*/gtk4-encode-symbolic-svg.* usr/share/man/*/gtk4-icon-browser.* usr/share/man/*/gtk4-widget-factory.* diff --git a/debian/libgtk-4-bin.install b/debian/libgtk-4-bin.install index 18f59f5310..e547e0b8f7 100644 --- a/debian/libgtk-4-bin.install +++ b/debian/libgtk-4-bin.install @@ -1,10 +1,10 @@ +# Currently shipped by libgtk-3-bin +#usr/share/gettext/its/gtkbuilder.its +#usr/share/gettext/its/gtkbuilder.loc usr/bin/gtk4-broadwayd usr/bin/gtk4-builder-tool usr/bin/gtk4-launch usr/bin/gtk4-query-settings -# Currently shipped by libgtk-3-bin -#usr/share/gettext/its/gtkbuilder.its -#usr/share/gettext/its/gtkbuilder.loc usr/share/man/man1/gtk4-broadwayd.1 usr/share/man/man1/gtk4-builder-tool.1 usr/share/man/man1/gtk4-launch.1 diff --git a/debian/libgtk-4-dev.install b/debian/libgtk-4-dev.install index 5a294cf0de..2dd5409c42 100644 --- a/debian/libgtk-4-dev.install +++ b/debian/libgtk-4-dev.install @@ -1,9 +1,9 @@ -usr/include/gtk* -usr/lib/*/libgtk*.so -usr/lib/*/pkgconfig/g?k* -usr/share/gir-1.0 # Currently shipped by libgtk-3-dev # Since it's only used for the Inspector, there's no need # to have libgtk-4-dev depend on libgtk-3-dev now #usr/share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml +usr/include/gtk* +usr/lib/*/libgtk*.so +usr/lib/*/pkgconfig/g?k* +usr/share/gir-1.0 usr/share/gtk-4.0/gtkbuilder.rng -- 2.30.2